Merge "Remove functionality to load json files"