removing a lot of legacy stuff