removed lines commented out