Removing junk code for issue #795