removing commented out stuff to make diffing easier