Remove autoconfig code, prepare to add submoudel