Blaggart rides again (fixes for latest require/express + cleanup).