Remove the model facade
Fix the error caused in unit tests
Lint fix