Clean up to avoid leakage of concerns