Removed all architecture dependent configurations