improved data sources undeployment utilities