removed some unused copypaste code