Few fixes and removing unrequired files