Cleaned up old switchboard workflow