@fin this class is not finished yet but have to be merged fast. So the cleaner is commented in the batch job