cleanups, silence clang warnings