Removed dead code/comments, added a TODO regarding rename/hygiene issues.