Doing some continued cleanup on aws_connect class file