Removed dead/legacy code (pre DI model code)