Merge "Remove Debug Code"