Remove references to helper instance var