Simplify import steps, update Parse and Bolts references