Removed subnamespace for models
Removed dead code