Configuration cleanup and improvements