cleanup before merge with `hidden-server`