removes json logic and general cleanup