Huge clean-up
First release under new name and cleanup