remove implicit
code refactored
refactoring (simplification of the detection)
Refactoring of the reaper part
Removed some deprecated code.