Fixed cleanup code