Cleaned up for aws