Removing more unused stuff