move final values to constructor.
move invariant value to constructor.
comment out unused classes.