Update to config and removal of redundant files