Commented out a few regex expressions