diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index b6681872a76d248b15d739a1abe261b12a9ae5d5..b2c513f74fcd1bff0cdd835d73fa1c1b14898370 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -342,7 +342,6 @@ Get single file NSD Content in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_ZIP}, ${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content
-    Rest Instances      frankie.json
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -402,10 +401,8 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File  ${contentZipFile}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
-    Log     ${response}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
-    Log     ${response}
     Set Suite Variable      ${response}     ${response}
 
 
@@ -423,7 +420,6 @@ Send PUT Request to upload NSD Content as zip file in synchronous mode
     ${body}=  Get Binary File  ${contentZipFile}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
-    #Log     Got frankie's put with ${response.status_code}
     ${response}=    Create Dictionary   status=${response.status_code}
     Set Suite Variable      ${response}     ${response}
 
@@ -748,10 +744,8 @@ Send PUT Request to upload PNFD Content as plain text file
     Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File  ${contentZipFile}
     ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoUpld}/pnfd_content     data=${body}
-    Log     ${response}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
-    Log     ${response}
     Set Suite Variable      ${response}     ${response}
 
 
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index e2315bd506e26497635ff0828fb1d27a4b249146..de6418c750e0d322435023ecd781f93700b5f42a 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -295,8 +295,6 @@ Configure Notification Forward
     Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
 
 Create Sessions
-    ${dir}=     List Directory  ${MOCK_SERVER_DIR}
-    Log     ${dir}
     Start Process  java  -jar ${MOCK_SERVER_JAR} -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 9c5a80749f5f76c192b9ccc56052cd797c73b827..7d4b0a285b58ed2193c7a5ea239581c2286aa211 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -15,9 +15,7 @@ ${FIELD_USAGE}    1
 ${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
 ${NFVO_AUTH_USAGE}    1 #never refernced
 
-#MOCK_SERVER_JAR one too many '..'
 ${MOCK_SERVER_JAR}    ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
-${MOCK_SERVER_DIR}    ../../bin/
 
 ${callback_port}    9091
 ${callback_uri}    http://172.22.1.7:${callback_port}