prefer constant to macro

Change-Id: I5e629491b5be9e2de1f72fdbe6887038305d0742
Drop unused member variables

They were gone with 4ce2602befd59e69264d8e4ced8730b40c2b947c /
b6ff19fba3a1a6d65134539a71d7a8df0e35d4ff.

Change-Id: Ida5790f77d619fdc91dfce11b186ed5e15587ddf