cleanup unneeded interface and make order of config more logic