Removed more uneeded material