1. Get rid of block implementations in AVOS cloud queries.