Re-organize code.
Add discontinued note