More trimming, clean up etc. but stil finalizer bug continues