removed more leftover code