deleted some dead variables