removed antiquated code