Removed NET20 leftovers