Cleanups

Signed-off-by: Daniel Farina <daniel@fdr.io>