Removed an unneeded interface.
Cleaning up unused methods and interfaces.
Started working on controls.