Unused DAO code removed