early abort cleanup. Closes #1