Simplify for now