Repair Rubocop violations
Remove image ids; should be in native plugin