Removed more unused stuff.