Good cache: I've seen the PR and had to do the anjustments, just forgot to remove the files after merge (that's also reason why I want to merge this sooner than later: not wanting to spend rest of my life resolving merge conflicts :)