[fix] More regex rule cleanup