DAL cleanup, double refactoring.