clean-up: at some point this deserves a full clean-up