Yeah, this should definitely be removed then.