Again some cleaning