Cleanup (common method extracted)