more clean up changes