Refactoring dao to not use service
Refactored more controller methods -> service