cleaned up code, deleted user index