Remove direct dependency on express