Removed more unsused code