remove more unnecessary layouts