Fix redundant and confusing constants

[TaylerUva]

We have commented out code and what is INTAKE_TRANSFER_SPEED?

Also names should be better connected to their states.