Removing step-parent, so that we can build first time