Remove many instances of brackets.fs usage