--- a/build/clang-plugin/clang-plugin.cpp
+++ b/build/clang-plugin/clang-plugin.cpp
@@ -25,24 +25,16 @@ using namespace clang;
 #if CLANG_VERSION_FULL >= 306
 typedef std::unique_ptr<ASTConsumer> ASTConsumerPtr;
 #else
 typedef ASTConsumer *ASTConsumerPtr;
 #endif
 
 namespace {
 
-QualType GetCallReturnType(const CallExpr *expr) {
-#if CLANG_VERSION_FULL >= 307
-  return expr->getCallReturnType(expr->getCalleeDecl()->getASTContext());
-#else
-  return expr->getCallReturnType();
-#endif
-}
-
 using namespace clang::ast_matchers;
 class DiagnosticsMatcher {
 public:
   DiagnosticsMatcher();
 
   ASTConsumerPtr makeASTConsumer() { return astMatcher.newASTConsumer(); }
 
 private:
@@ -498,23 +490,16 @@ const FieldDecl *getClassRefCntMember(co
        field != e; ++field) {
     if (field->getName() == "mRefCnt") {
       return *field;
     }
   }
   return 0;
 }
 
-const FieldDecl *getClassRefCntMember(QualType T) {
-  while (const ArrayType *arrTy = T->getAsArrayTypeUnsafe())
-    T = arrTy->getElementType();
-  CXXRecordDecl *clazz = T->getAsCXXRecordDecl();
-  return clazz ? getClassRefCntMember(clazz) : 0;
-}
-
 const FieldDecl *getBaseRefCntMember(QualType T);
 
 const FieldDecl *getBaseRefCntMember(const CXXRecordDecl *D) {
   const FieldDecl *refCntMember = getClassRefCntMember(D);
   if (refCntMember && isClassRefCounted(D)) {
     return refCntMember;
   }
 
@@ -1312,18 +1297,16 @@ void DiagnosticsMatcher::NonMemMovableCh
       "Cannot instantiate %0 with non-memmovable template argument %1");
   unsigned note1ID = Diag.getDiagnosticIDs()->getCustomDiagID(
       DiagnosticIDs::Note, "instantiation of %0 requested here");
 
   // Get the specialization
   const ClassTemplateSpecializationDecl *specialization =
       Result.Nodes.getNodeAs<ClassTemplateSpecializationDecl>("specialization");
   SourceLocation requestLoc = specialization->getPointOfInstantiation();
-  const CXXRecordDecl *templ =
-      specialization->getSpecializedTemplate()->getTemplatedDecl();
 
   // Report an error for every template argument which is non-memmovable
   const TemplateArgumentList &args =
       specialization->getTemplateInstantiationArgs();
   for (unsigned i = 0; i < args.size(); ++i) {
     QualType argType = args[i].getAsType();
     if (NonMemMovable.hasEffectiveAnnotation(args[i].getAsType())) {
       Diag.Report(specialization->getLocation(), errorID) << specialization