clean-up of remaining code