Removed unused container class