removed leftover code