Merge "Cleaned up dead code"