Removed unused architectures
This is not completely intensive but greatly simplifies the structure