More cleanup of old ugly decompiled code.