Dependency to brics DFA removed + import clean up