cleanup after #1127