[support] Image derivatives - help needed with cleanup