elastic setup, cleanups, aws composer