complete the old code cleaning
15 files changed