removed unnesesery code