Cleanup for version 1.0.2