Remove debugging logging
Avoid creating duplicate methods