Cleanup the croutons when you destroy

Change-Id: Ia5acae25517bb8afb23b9238d82a70966e51aed6