Removed some leftover code