Registry clean-up