Cleanup init order