Removed yet even more