Removed more unused.