Eliminating hardcoded debugging lines again