Merge pull request #1354 from emilazy/remove-which-use