Some cleanup
release v2.0.0