Revert "Fixed bugs in express code"

This reverts commit f43a96f8fb0b68b0fec10a1cdae22e5f2246e4aa.
Revert "Updated express implementation"

This reverts commit fb752f430fef0dc80b1bf1f8c0e33057696b7892.