Should modularize code more so that we aren't deleting extra collected information at the end

[tanhakabir]

Currently we are creating data and then removing it later. We should make the processing steps less coupled so that we aren't duplicating data to delete later.