[refactor] More refactoring for 2.0
[typo] removing test file