Clean up old monitoring code