diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..11d114c2c7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,25 @@
+ROC Tracer library, Callback/Activity APIs
+
+The library source tree:
+ - doc  - Documentation
+ - inc/roctracer.h - Library public API
+ - src  - Library sources
+   - core - Library API sources
+   - util - Library utils sources
+ - test - test suit
+   - MatrixTranspose - test based on HIP MatrixTranspose sample
+
+Environment:
+$ export HIP_PATH=<HIP path>
+$ export HCC_HOME=<HCC path>
+$ export CMAKE_PREFIX_PATH=/opt/rocm/lib:/opt/rocm/include/hsa
+
+To build:
+$ cd <your path>/roctracer/build
+$ cmake ..
+$ make
+
+To rebuild and run test:
+$ export ITERATIONS=<iterations number [100]>
+$ cd <your path>/roctracer/test/MatrixTranspose
+$ make
diff --git a/Readme.txt b/Readme.txt
deleted file mode 100644
index 8a95e5cc5e..0000000000
--- a/Readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ROC Profiler/Traces library.
-Callback and Activity APIs
-
-The library source tree:
- - doc  - Documentation
- - inc/roctracer.h - Library public API
- - src  - Library sources
-   - core - Library API sources
-   - util - Library utils sources
diff --git a/cmake_modules/env.cmake b/cmake_modules/env.cmake
index 8cc0642116..a99d09057c 100644
--- a/cmake_modules/env.cmake
+++ b/cmake_modules/env.cmake
@@ -58,7 +58,7 @@ if ( NOT DEFINED CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH} )
   set ( CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH} )
 endif()
 
-set ( HIP_INC_DIR $ENV{HIP_INC_DIR} )
+set ( HIP_INC_DIR "$ENV{HIP_PATH}/include" )
 
 ## Extend Compiler flags based on build type
 string ( TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE )
diff --git a/test/MatrixTranspose/Makefile b/test/MatrixTranspose/Makefile
index 88483385ee..7c22cd4afe 100644
--- a/test/MatrixTranspose/Makefile
+++ b/test/MatrixTranspose/Makefile
@@ -3,18 +3,14 @@ LIB_PATH=$(ROOT_PATH)/b
 LIB_NAME=roctracer64
 ROC_LIBS=-L$(LIB_PATH) -l$(LIB_NAME)
 
-HIP_PATH?=/home/evgeny/work/roc-1.8.x/hip
-HCC_PATH?=/home/evgeny/work/roc-1.8.x/hcc/b
-
 HIPCC=$(HIP_PATH)/bin/hipcc
-HCC_LIBS=-L$(HCC_PATH)/lib -lmcwamp_hsa
+HCC_LIBS=-L$(HCC_HOME)/lib -lmcwamp_hsa
 
 SOURCES = MatrixTranspose.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
 EXECUTABLE=./MatrixTranspose
-export LD_LIBRARY_PATH=$(LIB_PATH):$(HIP_PATH)/lib:$(HCC_PATH)/lib
-export HCC_HOME=$(HCC_PATH)
+export LD_LIBRARY_PATH=$(LIB_PATH):$(HIP_PATH)/lib:$(HCC_HOME)/lib
 
 .PHONY: test
 
diff --git a/test/MatrixTranspose/MatrixTranspose.cpp b/test/MatrixTranspose/MatrixTranspose.cpp
index 9c0bb9d809..03fcf1ca56 100644
--- a/test/MatrixTranspose/MatrixTranspose.cpp
+++ b/test/MatrixTranspose/MatrixTranspose.cpp
@@ -187,16 +187,6 @@ extern "C" void hip_api_callback(
           hipKernelNameRef(data->args.hipModuleLaunchKernel.f),
           data->args.hipModuleLaunchKernel.stream);
         break;
-      case HIP_API_ID_hipLaunchKernel:
-        fprintf(stdout, "kernel(%p) stream(%p)",
-          data->args.hipLaunchKernel.kernel,
-          data->args.hipLaunchKernel.stream);
-        break;
-      case HIP_API_ID_hipKernel:
-        fprintf(stdout, "start(%lu) end(%lu)",
-          data->args.hipKernel.start,
-          data->args.hipKernel.end);
-        break;
       default:
         break;
     }