Added missing cleanup