Few changes for easier debugging in IDE
removing unnecessary file