Cleanup. This is 1.0.1