Some minor cleanup of what appears to be dead code

Resolves #1510