Remove soem unneeded code