change hardcoded path to use config file values
removing commented out code
fixing merge conflict