Updated dependencies && remove legacy code