Removed end_points (no use)