Cleaned up FS API.