more debug comments removed