Cleaned up code, removed extraneous files and directories