Still removing unused code.