Moving to marmalade, general cleanup