Remove replace return statement with exit