codebase cleanup - remove redundant code constructs, use modern APIsSigned-off-by: Lukas Jungmann <lukas.jungmann@oracle.com> (commit: 6a5c36b)