Removing regex for now