Merge "Remove obsolete debug option"