Removed unnecessary containers and wrappers