Remove depacreated files those makes confuse with active versions
Refactor code as preparation for mode implementation to calibration