Clean up junk from layout