Remove minor leftover code