IFS usage removed