Merge "Cleanup duplicate/unused code"