Code Cleanup: More Dup Code Gone