Remove vanilla since it causes so much confusion