Deleted some unnecessary files, some fixes