Optionalcleanups

instead of asking if something can be removed, I thought to create a pull request from it.

Please have a look at these three cleanup actions, and determine if they should be honoured or not.