refactor: remove some useless code
Merge branch 'development'