Clean up bogus container-related code.