data layer and mvc application cleanup