removed some urelated code