remove original atom
Removes several more unused variables
Merge pull request #1878 from Zelacks/remove_original_atom

Removes unused variables