Front matter cleanup