I removed the thingy here above as it was nothing but insult. I think that if you look what is NOW regarded as heavy metal Wolfmother is not, stoner metal, na also not influenced by them probably, Psychedelic Rock and Hard Rock would be right, earlier named grunge, completely not. Pop rock? Not at all it is miles away from pop rock, not that it is superhardcoreultramegaunderground but pop rock, no I am just looking what neo-psychedelica is so I leave that one open. So psychecdelic and hard rock should stay, stoner should be left out and heavy metal depends on what your definition of it is, if you mean by that the first bands like Black Sabbath and you see the NWOBHM bands and beyond as not heavy metal but really different genres than Heavy Metal would be okay.