Removed pointless layouts