Remove unused variables and deprecated data updates
Merge pull request #331 from jvc26/remove-unnecessary-vars

Remove unused variables and deprecated data updates