Remove the exit path and use a configure message to exit instead...
More cleanup and consolidation...