Remove base container dependency

Signed-off-by: Michael Barton <mail@michaelbarton.me.uk>