remove references to DataSet entity
Update database populator and security config