Removed some useless variables