- Slightly better messaging includes active paths
- Cleanup some unused vars