Revert "Updated express implementation"

This reverts commit 65b360d474275f5b897062cc5eca13a3b0bd799d.