Cleaning up unnecessary class variables