cleanup in todo's for EFA-Init