remove the wrapper from layouts when not needed