cleanup
Merging origin/gtorres/master-pending-cleanup into master