Cleanup graph lwrp; Fixes to trigger and item