Some more clean up...