Remove more un-needed for now config calls