Remove unused tools as discussed with Daniel Pan