Removed everything except aws overrides