Cleanup 2

Signed-off-by: Kamaal Aboothalib <kamaal@kamaal.me>