removed unused helper and json