some cleaning in monitoring