Initial AWS cleanup