[Model] Model elements should be Interfaces
Remove unused lines of code

* This was added by mistake