Cleaned up testbed configurations