Config cleanup

@mwall another config cleanup for review and check if lines up with new dev env.