debug comments removed