Fixed cleanup