[cosmetics] removed unused variables and code

@FernetMenta for review please.