Clean up for a new layout