More cleanup
Bumping to version 2.0.2