Feature/remove compiler warnings