more clean-up: remove unused defs