Attempting to remove clang warnings