remove leagcy code