Further cleaning and prep.

Signed-off-by: Sunstrike <sunstrike@azurenode.net>