Cleaning up for first release