move nonessential functions to EFA-Configure etc.