removing stuff to make it work