make remove/delete consistent between container/image
Merge pull request #90 from phemmer/remove_delete

make remove/delete consistent between container/image