removed code specific to AWS