Removed old .pup package tools and made man less hacky.
Second round of cleanup.