clean-up of problem #1