Get rid of command.fs