standardizes config
removes old commented-out code