Use the shimmed indexOf everywhere
Removing unnecessary paths from package.json