Removed puppetrun lines. Some code cleanup.