Cleaned up BJC container