removed useless variables