Ports in config files, README update and removed unused code