dsa: clean-up