remove extra config; some comments