Fixed cleanup again