FS-3 cleaned code