cleaning up layouts for production