Cleaned up data.views and drp.admin