cleanup warnings,old code