Cleanup container rm funcs

Signed-off-by: Brian Goff <cpuguy83@gmail.com>