Removed unnecessary files and few improvements