Removed TODO tag in Controller.