Replaced use of analysis monitor and removed it