Config cleanup and Queue name now based on application name