fix remove containers & images