Clean out entity onupdate to bare neccesities