Huge refactoring (lot of deletions, will be eventually controlled & re-added later)