Get rid of unneeded returns