Remove accidental override.
Move Streams to NCPCore.
Import cleanup.