BLK-77 Removes Cruft

Signed-off-by: Oren Leiman <oleiman@neutral.io>