Further cleanup of server packaging code.