Cleanups in user.js