Removing unnecessary code
Fixing the DAO definition pattern