Cleanup

Unsure if I had any reason for not changing parent_id, but it's changed now...