Bugid 90537 old ab cleanup