cleanup, getting ready for remake