christianhaeubl Merge pull request #37 from native-image-jfr/chaeubl/cleanups-v4