removed a few returns