Clean up some conf parsing

Change-Id: Idba39e06e3db8eca84f3cef8c597ad222cf6d532