Improvement: remove containers and images