Cleanup consul code