Remove un-needed class/stream

Signed-off-by: Chris Sanders <zidane@outlook.com>