[BUGFIX] Remove remaining reference to removed class