removing unneed code