Removed more useless Layouts