Merge "Clean up comments/logs"