First swipe at removing tornado and unnecessary AWS params