Remove leftover code from removed feature