remove unneeded returns