I have no idea when I have previously looked into those two files (git history would probably tell me), but I don't think they make much sense, while the important parts can be cut into conf.d/ and applied individually as needed.
