Remove extra workarounds