Some more clean up.