Add a simple abort function
Remove the old cumbersome abort function