BAC-777 removing more unused variables