Cleanup unused instance variables.

Issue: BMS-176