Fix unused class fields