Remove some old workarounds that are no longer required