Remove Unneeded whitelist elms
Tidy Up Graph Generation + Tiny Misc