Removed some completed TODO notes