removed unneeded returns