Remove more leftover code