removed more weird things