Removed more unused code.