[#8] Removed unused layout pieces.