And more cleanup