Remove direct dependency to express