Fixed cleanup on destruct