diff --git a/app/conf/goaws.yaml b/app/conf/goaws.yaml
index e926598..24cd6a6 100755
--- a/app/conf/goaws.yaml
+++ b/app/conf/goaws.yaml
@@ -1,11 +1,7 @@
 Local:                              # Environment name that can be passed on the command line
   #     (i.e.: ./goaws [Local | Dev]  -- defaults to 'Local')
   Host: goaws.com                   # hostname of the goaws system  (for docker-compose this is the tag name of the container)
-  # you can now use either 1 port for both sns and sqs or alternatively you can comment out Port and use SqsPort + SnsPort for compatibilyt with
-  # yopa and (fage-sns + face-sqs).  If both ways are in the config file on the one "Port" will be used by GoAws
   Port: 4100                        # port to listen on.
-  # SqsPort: 9324                     # alterante Sqs Port
-  # SnsPort: 9292                     # alternate Sns Port
   Region: us-east-1
   AccountId: "100010001000"
   LogToFile: false                 # Log messages (true/false)
@@ -17,7 +13,6 @@ Local:                              # Environment name that can be passed on the
     MaximumMessageSize: 262144         # maximum message size (bytes)
 #    MessageRetentionPeriod: 445600     # time period to retain messages (seconds) NOTE: Functionality not implemented
   Queues: []                        # No default queues — created via Admin API / AWS CLI by tenants
-  Topics: []                        # No default topics
   RandomLatency:                    # Parameters for introducing random latency into message queuing
     Min: 0                          # Desired latency in milliseconds, if min and max are zero, no latency will be applied.
     Max: 0                          # Desired latency in milliseconds
@@ -25,20 +20,10 @@ Local:                              # Environment name that can be passed on the
 Dev:                                # Another environment
   Host: localhost
   Port: 4100
-  # SqsPort: 9324
-  # SnsPort: 9292
   AccountId: "794373491471"
   LogToFile: false
   LogFile: ./goaws_messages.log
   Queues:
     - Name: dev-queue1
     - Name: dev-queue2
-  Topics:
-    - Name: dev-topic1
-      Subscriptions:
-        - QueueName: dev-queue3
-          Raw: false
-        - QueueName: dev-queue4
-          Raw: true
-    - Name: dev-topic2