Fix previous merge mistake
Remove now unused layout