Removed unused code in layouts/default