Removed wrong code from Genotype