Cleaned up files
Merge