Removed unnecessary boxes