Removed some legacy assertions