Cleanup not relevant codes and originated codes from JaasLaunge