expression rules api cleanup