Remove old return code