removed some dead code, now useless debug logging and outdated TODO comments;