Resolves #1510
Some minor cleanup of what appears to be dead code