Temp removal of some stuff to prevent crash