Cleaned code, got rid of extraneous crap I made when I was young and foolish