clean up
more cleaning
removing smokeworld from pro
merge