Removed unnecessary containers