Get Denis clean-up changes