Version 1.0?
Cleanup