Fixed cleanup code.