Code clean, remove circular dependency check on expression validator (to
be improved)