Commenting out a bunch of stuff to see if I can get this to work on AWS