Leftovers from a refactor. :P