Remove not used angular, step 1
Refact