SA modification, removed debugging from removes