Remove leftover code. No functional changes