Step before major code cleaning