Fixed the expressjs nonsense
Cleaning up some dead code