cleanup after #417