Made code less copycat

Removed some BTW code, and moved the web speed penalty to the
appropriate place.