remove more aws, update berks and metdata