get rid of unneeded stuff; update method of storing aws stuff