removed useless vars