removed unnecery code