added support to ignore cleaners