Actually I change my mind, this PR is small and focused and could be merged as it is. :+1: for merging. It's good to have more deletions thand adds in a PR :)