cleanup and getting ready to make demoable