Some more cleanup, no newstream in Gold