clean-up of previous (disabled) code