Adding more indices for faster consolidation
Disabling some code for speed

For some reason this code might be the culprit of a slow build. Not sure
why. Going to experiment with it tonight.