Feature/cfy 443 cli fixes to teardown feature