Removing redundant files and methods in dao classes