Cleaned branch

[nirzaf]

Code formatted and cleaned unused using directives

[thiennn]

Hi @nirzaf the change look nice. However it huge I cannot review all of them. Could you please break in to smaller PRs

[hishamco]

This is huge it's hard to review, I suggest closing this, @nirzaf please move it into smaller manageable PRs