properly remove effects when a match ends