remove Cyrus' code because we want to start clean