Remove Workaround

Correct way to make that not more workaround & Cleanup