Cleanup and change version number to 2.0.0