Very bad code is replaced with much better.

Very bad code is removed.