remove old code, tests fully working