Updated EGRET with remove X/Y stuff.