Alejandro Velez
config fix and cleanup
db1d3e7