file cleanup and minor config change