got rid of unnecessary files, cleaned up code
cleaned up the code some more