Remove old TODO:'s and some outdated comments