More Cleanup on TODO's