Merge "Calling super.finalize() in finalize() methods. Also cleanup code, mostly removing unused handlers and casts."