more cleanup in init config and views