Removed all extras
Bumped version number to 2.1.0