GEP-46 Removed debug statements