Remove build files
Merge changes