remove cpu_* and memory_* in favour of a generic hash

Change-Id: I76630963c7d4fd596a228361a2ffb614ade2e8d7