Cleanup, removed rubocop disabled stuff