Clean-up scope changes