Make numeric fields less clumsy
Delete commented out lines