removing dependency on express