Last cleanup for marmalade