Removing unused code

This code probably should never have been included. This is a "fix" for issue 602.