clean-up to old-stuff