More unused code removed