Some cleaunp work done, some more needed