Clean up denormalization