Fix cleanContainers and switch all deletion to cleanContainers

cleanContainers function doesn't seems to be working well for containers. Lets fix that and while at it, switch all deletion to it. This will essentially mean delayed deletion, however that should be fine. 

Docklet task - https://github.com/CodeNow/docklet/issues/40
