Deleted some unused variables