We should definitely remove this from here, but I reckon we can handle that in another PR as it was not introduced with this one.