SSP-1114 Comment out incomplete tools

Essentially a partial cherry pick of
0281ebadffce1aaa53e512ae907088e2b97f4a84