Remove unnecessary layouts