removed cruft (old commented out statements)