upgrade to hdp 2.1 and cleanup
test