Optimized user lookup, cleanups