removing all rest stuff to be able to go fwd with a simpler version