remove monitor_cpu_* and monitor_memory_* in favour of a generic hash

Change-Id: Ica717d6eccbad2f96f6f2cfc7198f2d388bacf47