Remove more pattern guards