removed some added stuff