Clean-up Org configuration