Removing companies and fixing json.rb to use 8.x.x