replaced unneeded workarounds