Cleanup following changes