Updating for newer Express and clean up