cleanup note in cb0ba6c