Some more clean up