Remove dead code
Fix typo
Simplify label and path fetching