outorg2 and outxxtra cleaned up, new requires.