General cleanup of forked baseline