More legacy aws removed