Refactor a bit more OOP
Removing query that is no longer needed