refactor: continue refactoring to remove angular