Remove unnecessary layout layer