Code cleanup. Removed deprecated code.
Less serious error message on abort(xxx) calls without second reason parameter.