Remove uneeded shims