Remove workarounds for outdated versions