cleanup warnings
more cleanup
Merging origin/gtorres/master-pending-morecleanup into master