Cleanup for Beta (0.9.0)

Disabled defunct functionality, cleaned up