removing duplicates
consolidating the UI sections
Merge pull request #825 from caskdata/feature/cdap-default-cleanup

Feature/cdap default cleanup