NAFJM-4: fix sample ini, cleanup code