removed some earlier code