Cleanup, relooked at why triggers cant have data