stack: clean-ups