some changes in the cleaner function, this had some kernel functions while a spinlock is hold.