Increase functionality by removing code #3576

Removing this code because:
1. It looks like it has buffers that can be overflowed
2. No one is using it.

Also note that it is in the shadow, so we get another win.