[PATCH] remote: remove/annotate unused variables