More changes. Deleted unnecessary files