Move most metadata into notes