Remove unused shims