Remove unneeded code from monitor