remove common block out of aws vs others fork