crespo: cleanup

Change-Id: Ic45c9aee2b99c98802651751eb595d546c1ff14f