cleanup; removed unrelated code