#1: Removing it.
#2: Maybe. Marking it as outside the scope for this pull request