removed unneeded abort