Remove unneeded helpers
Fix rubocop