Removed more unused stuff