Clean up conf & structure