Unify/cleanup max snapshot entities on client and server