Sounds like a good decision to avoid the triggers.
I've been fighting urges too - you're not alone!
hang in there.....