Remove unused variable, reorganize config