Removed some old files that are no longer used, and sped up execution time significantly. Moving to work on data extraction.