remove unnecessary $? in return and exit calls

remove unnecessary $? in return and exit calls #1366