cleaned up code, deleted obsolete files