Removed some old code no longer used.
Expanded controller functionality.