Some vriable cleanup out of the user controller