Remove leftover code