Remove common code