Remove unused ivars