Code cleanup. AIRAVATA-1185