WIP: remove some left-out comments