Add more pervasive logging
Clean up needless functions
Remove duplicate method
Add qualification for stale dir paths