Removed comments and empty files
Merge