cleaned up code, deleted some unnecessary files