minor cleanups of unused code