[fa] Some clean up on rules and annotate to since version