Lots more clean up