Remove unused code AGAIN!