removed some useless variables