remove marked on client side
remove unused cond
merging ok
caching marked on server side