final cleanups / remove compiler warnings