Cleanup controllers with Resharper feedback