Removed more gumpf