Remove code from other branch-in-progress