Removing a few redundant event triggers that were slowing things down.