Removing useless class
Cleaning up

Cleaning up, documenting, and removing warnings