Remove redundant .match() check