Removed hard coded archs