Removing some stuff that is out of scope for first release

Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>