Feature/#318 cleaning warnings