Cleanup

Just cleaning up some files and code.