Cleanup
Bump version to 2.1
Finish 2.1