Removed references to old state variables