Merge "Clean up unused code"