Cleaning up

So Daniel can clone and we’re on same page.