Removed dead variables