removed the stuff that kept causing problems