[REFACTOR] removes workarounds