ACCESS: Remove a useless variable, some renaming