Added cleaner.
Merge remote-tracking branch 'simong/authz-performance'