Kill some leftover comments after migrating everything to new system