#64: Fix cleanup execution