Resolves #1510
Some minor cleanup of what appears to be dead code
Merge pull request #1511 from aochsner/minor_cleanup

Some minor cleanup of what appears to be dead code