Merge pull request #5970 from asbachb/simplify-javaee

Refactoring: Simplify `Profile`