Suspicious comments, code review fixes

Removed "TODO" and "hack" comments.