cleaned up code, got rid of some unused files