Update version to 2.0.0

Also clean up commented out requirements