feature/#318 warnings cleanup final take