removed dependencies on pattern matching libs