Revert "Modernize some parts see description"

This reverts commit ea3bb7e77ef34185fedb87d61c622075bf49d214.