Remove shim files that were created to address #1873

no issue

- safe to remove going into 0.5