I should really wait before doing a merge request... more clean up.
This should be the last one.