MODIFIED: clean-up