removed unrelated code