removed dependency to Genetics [project refs]
Code clean for complex tree