More cleanup for vanilla core.
(I'm tired and someone else to do some cleaning)