Cleaned up some things, removed unused code