remove unused variable, some renaming