Some cleanup and aded removal of EFA-init from root login