removed unnecessary super calls
removed package from json on uninstall
dsl cleanup, test reorg