#5 cleanup warnings