Fix: remove deprecated code
Fix: remove duplicated files