Removing defunct code.

fixes #1151