Added handling of default files to setup. Removed unnecessary code.