only reactivate if needed
remove obsolete code
small correction