Some more clean up
OSme more clean up