Remove more unused code