some cleaning ...