Some more clean up stuff
Clean up