constructor clean-up