Remove more Rubocop offenses