Cleanup extraneous regexp escapes
Push the service specific checks out to a module