(MAINT) Perform more thorough cleanup on master.

Signed-off-by: Wayne <wayne@puppetlabs.com>