temporary cleanup of debug comments (to be removed in later commit)