Reduced logging in new code