removed some more crud