Remove unused code I thought I removed already