unnecessary layouts removed