Remove stuff to get it working