Clean up code and version numbers