cleaned up some crap
cleaned up more random crap