Removing even more code to try and slim down core file indexing process