Removed unnecessary layouts