Remove unused code, second attempt