More cleanup, put back refactored AWS resources