Removed some unused variable