removed vestigial return trues