Removed sourcing of files, done in main