Remove unused code from configure.
Merge pull request #551 from SaberUK/master+unused-configure

Remove unused code from configure.