Cleanup EFA-Configure & fixed ipchange