Descendancy moduel - tidy layout and remove some unreachable code