Removed architectures, added support for compilation with clang