Remove shouldTerminate commented code