clean up
working - on demand, cdh