Removed: Extra checks