get rid of legacy hack