Removed leftover lines from the merge
Finished refactoring one of the model with the new ressource method and DataMapper
Finished refactoring