Remove unused code + warning