clean-up before extended functionality starts