Decouple daemon and container to cleanup containers.

Signed-off-by: David Calavera <david.calavera@gmail.com>