Fixed cleanup.