removed probably extra code