Cleaned up Controller classfile.

Removed unused code.