Cleanup

Removed random stuff that are getting used, in preparation to add more features.