Merge "Remove some debug print statements"