more cleanup and version up express