User controller clean-up