removed aws stuff