Added whare stuff, remove aws stuff