Merge "Remove unused / untested code"