added cleaner class and cleaner test, incorporated in Repository