Finish converting all checks
Remove unused references to fs