Post UI redesign cleanup