Feature/#318 cleaning warnings take2