cleaner pr for pull/260