cleanup of crufty code
cleanup of old junk