Removed some files
Merge local and online