Slight Cleanup

Deleted some unused things, made some library code pretty, and optimized imports.