Fixed a bug where a NPE was thrown after selecting a freshly build unit
Removed unused methods from Controller