cleaned up the code, deleted unused files