[hw,prim,sha] Cleanup waiver and remove old files

[hw,prim,sha] Cleanup waiver and remove old files #30002