More changes
Remove unnecessary controller code.