Remove stuff to make sync esier