cleaned up users index more