Removing references to global user object