Clean-up for release

Deleted some commented methods and such