Refactor, remove unneeded stat calls

Resolves gh-187