Removed FS references and fixed hinting