Same thing - should these just be moved to the otp-level?