Cleanup exit routines

Removed unused exit calls
Added some additional logging