[REFACTOR] removed workarounds