implemented force removal of containers, refactor