More merge cleanup, removed Aeson Json file