debugging code clean-ups