Get rid of unnecessary container