Fixed AutoUpdate setting and removed unneeded code.