Remove unnecessary / buggy / untested shims

Also had to remove bespoke-bullets due to a Safari issue.