More rule cleanup