Container fixes
Removed an unused import