Clean up and test before version release