working on removing angular