Remove unused vars - thanks, clang!